7fd960b93601b1a4a7966d3fe46789308800e78b,oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/impl/command/CommitCommandNew.java,CommitCommandNew,prepareCommit,#,170
Before Change
private void prepareCommit() throws Exception {
commit.setAffectedPaths(affectedPaths);
commit.setBaseRevisionId(mongoSync.getHeadRevisionId());
commit.setRevisionId(revisionId);
if (commit.getBranchId() == null && branchId != null) {
commit.setBranchId(branchId);
After Change
private void prepareCommit() throws Exception {
commit.setAffectedPaths(affectedPaths);
commit.setBaseRevisionId(branchId == null?
mongoSync.getHeadRevisionId() : baseRevisionId);
commit.setRevisionId(revisionId);
if (commit.getBranchId() == null && branchId != null) {
commit.setBranchId(branchId);